Just want to point out this kills the aura part of Radiant Faith, so it doesn't apply to minions or get exported as a party buff (Mana Guardian).

Using ReplaceMod/ReplaceModInternal doesn't seem to work for the ExtraAura as it gets confused and the Energy Shield overwrites the Armour aura (somehow i end up with 2 Energy Shield extra auras?!). Is making a special case LIST type to look at the nested mod type in ReplaceModInternal a good idea? Or are there some attributes we can set so they don't look the same to the current matching algo? Or is there a way to combine the armour and energy shield as a single Extra Aura mod ? However I think you'll encounter the same issue where you have to calculate auras (Purity of Elements/Lightning), then resistances/defence, then mana reservation, then extra auras which is quite a bit different to the current calculation order. So I think you have to either calculate resistances earlier, or calculate extra auras later.

I do find my PR (#9399) a little ugly, but I was trying not to alter the current code flow too much for anything other than the Foulborn Choir to reduce the chance of introducing bugs.

Just want to point out this kills the aura part of Radiant Faith, so it doesn't apply to minions or get exported as a party buff (Mana Guardian).

Using ReplaceMod/ReplaceModInternal doesn't seem to work for the ExtraAura as it gets confused and the Energy Shield overwrites the Armour aura (somehow i end up with 2 Energy Shield extra auras?!). Is making a special case LIST type to look at the nested mod type in ReplaceModInternal a good idea? Or are there some attributes we can set so they don't look the same to the current matching algo? Or is there a way to combine the armour and energy shield as a single Extra Aura mod ? However I think you'll encounter the same issue where you have to calculate auras (Purity of Elements/Lightning), then resistances/defence, then mana reservation, then extra auras which is quite a bit different to the current calculation order. So I think you have to either calculate resistances earlier, or calculate extra auras later.

I do find my PR (#9399) a little ugly, but I was trying not to alter the current code flow too much for anything other than the Foulborn Choir to reduce the chance of introducing bugs.

Fair enough, I'll close this PR as I was trying to do minimal changes/not change code flow but didn't realize it killed the aura portion. Where are you viewing the 2 ES auras? On my end its overwritten in the output.

Calculating extra auras later makes the most sense to me but is obviously prone to more issues, so it's probably something the core maintainers will have to reevaluate.